Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 19 Jul 2011 20:33:28 +0000 (13:33 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 19 Jul 2011 20:33:28 +0000 (13:33 -0700)
commit8791fa00d46f9125b10d6400101988474cb9aa06
tree0104bea14430652d0bd81a29e132c4b3e4ac11ea
parent6aedbea9ec4dcb52ccf5ac6f998d9081223a6706
parent1de332264e507000089f50f2b06bae40d89d569d
Merge from trunk.
src/ChangeLog
src/alloc.c
src/fileio.c
src/lread.c
src/xdisp.c